Avoid double-free problems

svn path=/trunk/; revision=18906

diff --git a/ChangeLog b/ChangeLog
index 0e58f86545ef9dc1fa99907b5227f09da6e4f45f..4ccba0fe69cedcec03ba738d86a4027be51ccde9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-12  Matthias Clasen  <mclasne@redhat.com> 
+
+       * gtk/updateiconcache.c: Avoid double-free problems by not
+       freeing data that may be cached elsewhere.
+
 2007-10-10  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentmanager.c (gtk_recent_info_get_icon): Document

diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index d44d93e5e0b37ba51dcf18be47987a78961609af..45d0cf00ef23af64da6a9364450287c3c49997d8 100644 (file)
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -199,13 +199,6 @@ typedef struct
   guint icon_data_size;
 } Image;
 
-static void
-free_icon_data (IconData *icon_data)
-{
-  g_free (icon_data->attach_points);
-  g_strfreev (icon_data->display_names);
-  g_free (icon_data);
-}
 
 static gboolean
 foreach_remove_func (gpointer key, gpointer value, gpointer user_data)
@@ -219,7 +212,6 @@ foreach_remove_func (gpointer key, gpointer value, gpointer user_data)
     {
       /* just a .icon file, throw away */
       g_free (key);
-      free_icon_data (image->icon_data);
       g_free (image);
 
       return TRUE;